Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 23 May 2010 11:52:45 +0000 (11:52 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 23 May 2010 11:52:45 +0000 (11:52 +0000)

Trivial merge